Add some more images for the widget gallery.
authorMatthias Clasen <matthiasc@src.gnome.org>
Sun, 10 Oct 2004 20:35:16 +0000 (20:35 +0000)
committerMatthias Clasen <matthiasc@src.gnome.org>
Sun, 10 Oct 2004 20:35:16 +0000 (20:35 +0000)
31 files changed:
ChangeLog
ChangeLog.pre-2-10
ChangeLog.pre-2-6
ChangeLog.pre-2-8
docs/reference/ChangeLog
docs/reference/gtk/Makefile.am
docs/reference/gtk/images/accel-label.png
docs/reference/gtk/images/button.png
docs/reference/gtk/images/check-button.png
docs/reference/gtk/images/color-button.png
docs/reference/gtk/images/combo-box-entry.png
docs/reference/gtk/images/entry.png
docs/reference/gtk/images/file-button.png
docs/reference/gtk/images/font-button.png
docs/reference/gtk/images/frame.png
docs/reference/gtk/images/icon-view.png
docs/reference/gtk/images/label.png
docs/reference/gtk/images/list-and-tree.png
docs/reference/gtk/images/menubar.png [new file with mode: 0644]
docs/reference/gtk/images/messagedialog.png [new file with mode: 0644]
docs/reference/gtk/images/multiline-text.png
docs/reference/gtk/images/notebook.png [new file with mode: 0644]
docs/reference/gtk/images/panes.png
docs/reference/gtk/images/progressbar.png [new file with mode: 0644]
docs/reference/gtk/images/radio-group.png
docs/reference/gtk/images/separator.png
docs/reference/gtk/images/toggle-button.png
docs/reference/gtk/images/toolbar.png [new file with mode: 0644]
docs/reference/gtk/images/window.png
docs/reference/gtk/visual_index.xml
docs/tools/widgets.c

index 360346b452c92a6125cb762439bdb71f6911af11..edbe184a62f60756b70e788c06ee5fc436d0bf86 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-10-10  Matthias Clasen  <matthias@localhost.localdomain>
+
+       * docs/tools/widgets.c: Create a toolbar, menubar and
+       messagedialog images.
+
+       * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_select_all): 
+       Avoid a warning.
+
 Sun Oct 10 11:24:56 2004  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcontainer.h (struct _GtkContainer): add /*< private >*/
index 360346b452c92a6125cb762439bdb71f6911af11..edbe184a62f60756b70e788c06ee5fc436d0bf86 100644 (file)
@@ -1,3 +1,11 @@
+2004-10-10  Matthias Clasen  <matthias@localhost.localdomain>
+
+       * docs/tools/widgets.c: Create a toolbar, menubar and
+       messagedialog images.
+
+       * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_select_all): 
+       Avoid a warning.
+
 Sun Oct 10 11:24:56 2004  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcontainer.h (struct _GtkContainer): add /*< private >*/
index 360346b452c92a6125cb762439bdb71f6911af11..edbe184a62f60756b70e788c06ee5fc436d0bf86 100644 (file)
@@ -1,3 +1,11 @@
+2004-10-10  Matthias Clasen  <matthias@localhost.localdomain>
+
+       * docs/tools/widgets.c: Create a toolbar, menubar and
+       messagedialog images.
+
+       * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_select_all): 
+       Avoid a warning.
+
 Sun Oct 10 11:24:56 2004  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcontainer.h (struct _GtkContainer): add /*< private >*/
index 360346b452c92a6125cb762439bdb71f6911af11..edbe184a62f60756b70e788c06ee5fc436d0bf86 100644 (file)
@@ -1,3 +1,11 @@
+2004-10-10  Matthias Clasen  <matthias@localhost.localdomain>
+
+       * docs/tools/widgets.c: Create a toolbar, menubar and
+       messagedialog images.
+
+       * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_select_all): 
+       Avoid a warning.
+
 Sun Oct 10 11:24:56 2004  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcontainer.h (struct _GtkContainer): add /*< private >*/
index efb2371092e6fc00f34bf49e67916f0049794624..0b88c26796be56518c365bb4041f76984d5cf411 100644 (file)
@@ -1,3 +1,15 @@
+2004-10-10  Matthias Clasen  <matthias@localhost.localdomain>
+
+       * gtk/images/progressbar.png:
+       * gtk/images/notebook.png:
+       * gtk/images/toolbar.png:
+       * gtk/images/menubar.png:
+       * gtk/images/messagedialog.png: New images.
+
+       * gtk/Makefile.am (HTML_IMAGES): 
+       * gtk/visual_index.xml: Add toolbar, menubar, progressbar, 
+       notebook and message dialog.
+
 2004-10-09  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/visual_index.xml: Correct some linkends.
index 918e44e27140fbfda8b0fae1759e6cb5cfdb420e..58512a61af6d579c57c8f34dad1e097a92e24308 100644 (file)
@@ -219,7 +219,12 @@ HTML_IMAGES = \
        $(srcdir)/images/window.png                                     \
        $(srcdir)/images/accel-label.png                                \
        $(srcdir)/images/file-button.png                                \
-       $(srcdir)/images/icon-view.png
+       $(srcdir)/images/icon-view.png                                  \
+       $(srcdir)/images/toolbar.png                                    \
+       $(srcdir)/images/menubar.png                                    \
+       $(srcdir)/images/notebook.png                                   \
+       $(srcdir)/images/progressbar.png                                \
+       $(srcdir)/images/messagedialog.png
 
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
index 2cd2363b78a79a76c2c29ba373341e8078617806..2e7d315d948337694416d590fe9f7ba76df9fb81 100644 (file)
Binary files a/docs/reference/gtk/images/accel-label.png and b/docs/reference/gtk/images/accel-label.png differ
index 78bf3cccf30d6518d3b60c9c8e1677a256c4a6ee..76e2f68f3a28ba64bb6f3d3a483f8de83948e8b0 100644 (file)
Binary files a/docs/reference/gtk/images/button.png and b/docs/reference/gtk/images/button.png differ
index 64f008e5262d73dd2a21698386f9131d30659197..a42487fc2e3705006c2efc460ae956bb87a6d03d 100644 (file)
Binary files a/docs/reference/gtk/images/check-button.png and b/docs/reference/gtk/images/check-button.png differ
index 6369cd54af1d6650dd91e002b57643c426a3f48f..e48a5771a8275813da2bda963e692cea67162776 100644 (file)
Binary files a/docs/reference/gtk/images/color-button.png and b/docs/reference/gtk/images/color-button.png differ
index 8f6f5167a9a4c1cf27ea0b92da3eb9ecae027257..edaacbf5daed83539d687e11de8335b1f9e1a4a8 100644 (file)
Binary files a/docs/reference/gtk/images/combo-box-entry.png and b/docs/reference/gtk/images/combo-box-entry.png differ
index 4786ec7b1121f966a22e62d90afcd6b4c537d0ea..708de64975c1d72c5d70cfef9377c9e3026c6f1e 100644 (file)
Binary files a/docs/reference/gtk/images/entry.png and b/docs/reference/gtk/images/entry.png differ
index 04e8ef781055ed8581af5f5d2f4f16ccb34da6a3..d0dc0d96982c8517a7c96d4a25bd850c9e2332bf 100644 (file)
Binary files a/docs/reference/gtk/images/file-button.png and b/docs/reference/gtk/images/file-button.png differ
index a3937da7de0c085cfb0b2768940c5c24e8e98968..e8ae8ad93e85307613cb29858b8025c99c3a3fa8 100644 (file)
Binary files a/docs/reference/gtk/images/font-button.png and b/docs/reference/gtk/images/font-button.png differ
index 18e4f9794436df4909d6965a34fadea63bc4b0d5..e67db869edcec03fb85623b1456ee82174ff43ab 100644 (file)
Binary files a/docs/reference/gtk/images/frame.png and b/docs/reference/gtk/images/frame.png differ
index ce53787cbf71bdb69bd57768dbaded1f02c74825..93eaff0863311ba62c4771ff58d27dec56122d44 100644 (file)
Binary files a/docs/reference/gtk/images/icon-view.png and b/docs/reference/gtk/images/icon-view.png differ
index abb3f3cda5b0f0c467b6468b13c8cedec777ce6a..b3cc70bf57aa80da049bdae4df8143223ce60707 100644 (file)
Binary files a/docs/reference/gtk/images/label.png and b/docs/reference/gtk/images/label.png differ
index 0c6d2ec8e8fb0fdc725bb44ad857fbe9fcc388ce..cd4831df0ca08c62a1569799052d96e5d5f27a38 100644 (file)
Binary files a/docs/reference/gtk/images/list-and-tree.png and b/docs/reference/gtk/images/list-and-tree.png differ
diff --git a/docs/reference/gtk/images/menubar.png b/docs/reference/gtk/images/menubar.png
new file mode 100644 (file)
index 0000000..51f0f06
Binary files /dev/null and b/docs/reference/gtk/images/menubar.png differ
diff --git a/docs/reference/gtk/images/messagedialog.png b/docs/reference/gtk/images/messagedialog.png
new file mode 100644 (file)
index 0000000..35c5f11
Binary files /dev/null and b/docs/reference/gtk/images/messagedialog.png differ
index 2e3229584f2bdd3f72b997d3a9e25b3e61f3acd9..8a0811abb22797ba963662c0cc08b2701524ee9b 100644 (file)
Binary files a/docs/reference/gtk/images/multiline-text.png and b/docs/reference/gtk/images/multiline-text.png differ
diff --git a/docs/reference/gtk/images/notebook.png b/docs/reference/gtk/images/notebook.png
new file mode 100644 (file)
index 0000000..7c562e4
Binary files /dev/null and b/docs/reference/gtk/images/notebook.png differ
index be3b15069425c31269ab772be09f6f422d584d1d..4214d9c615b29e9508c1e5b6e011e72143897f9e 100644 (file)
Binary files a/docs/reference/gtk/images/panes.png and b/docs/reference/gtk/images/panes.png differ
diff --git a/docs/reference/gtk/images/progressbar.png b/docs/reference/gtk/images/progressbar.png
new file mode 100644 (file)
index 0000000..abe116a
Binary files /dev/null and b/docs/reference/gtk/images/progressbar.png differ
index 092a35db9c5b8a3953b452766ef079fb0edeb495..87200d0f5ba3760e9191410ebc83530f088ed771 100644 (file)
Binary files a/docs/reference/gtk/images/radio-group.png and b/docs/reference/gtk/images/radio-group.png differ
index 9d2ae4d1a75fa0adbdd1c737982e2511433d83ad..d769bb53546885749672a1ee873123f04ecf63cc 100644 (file)
Binary files a/docs/reference/gtk/images/separator.png and b/docs/reference/gtk/images/separator.png differ
index d147d0e7e06d1edd05a481b27abf3b48c026e16d..a10fbd4e200c1ae5c5178d80393dbbdf26d95d39 100644 (file)
Binary files a/docs/reference/gtk/images/toggle-button.png and b/docs/reference/gtk/images/toggle-button.png differ
diff --git a/docs/reference/gtk/images/toolbar.png b/docs/reference/gtk/images/toolbar.png
new file mode 100644 (file)
index 0000000..55b1167
Binary files /dev/null and b/docs/reference/gtk/images/toolbar.png differ
index 926a7730222ed76bff1fd7e19c40c8df9d1129de..a28c8dc584f6d462e78a096ff79eee3870eaf9bb 100644 (file)
Binary files a/docs/reference/gtk/images/window.png and b/docs/reference/gtk/images/window.png differ
index ff131046cb3ed962ba92659c1ae7079bb11aba78..00d61f98ef594a54122dee0dd5447d311d4f84c3 100644 (file)
@@ -1,20 +1,48 @@
 <para role="gallery">
-<link linkend="GtkAccelLabel"><inlinegraphic fileref="accel-label.png" format="PNG"></inlinegraphic></link>
-<link linkend="GtkButton"><inlinegraphic fileref="button.png" format="PNG"></inlinegraphic></link>
-<link linkend="GtkCheckButton"><inlinegraphic fileref="check-button.png" format="PNG"></inlinegraphic></link>
-<link linkend="GtkColorButton"><inlinegraphic fileref="color-button.png" format="PNG"></inlinegraphic></link>
-<link linkend="GtkComboBoxEntry"><inlinegraphic fileref="combo-box-entry.png" format="PNG"></inlinegraphic></link>
-<link linkend="GtkEntry"><inlinegraphic fileref="entry.png" format="PNG"></inlinegraphic></link>
-<link linkend="gtk-GtkFileChooserButton"><inlinegraphic fileref="file-button.png" format="PNG"></inlinegraphic></link>
-<link linkend="GtkFontButton"><inlinegraphic fileref="font-button.png" format="PNG"></inlinegraphic></link>
-<link linkend="GtkFrame"><inlinegraphic fileref="frame.png" format="PNG"></inlinegraphic></link>
-<link linkend="GtkIconView"><inlinegraphic fileref="icon-view.png" format="PNG"></inlinegraphic></link>
-<link linkend="GtkLabel"><inlinegraphic fileref="label.png" format="PNG"></inlinegraphic></link>
-<link linkend="GtkTreeView"><inlinegraphic fileref="list-and-tree.png" format="PNG"></inlinegraphic></link>
-<link linkend="GtkTextView"><inlinegraphic fileref="multiline-text.png" format="PNG"></inlinegraphic></link>
-<link linkend="GtkPaned"><inlinegraphic fileref="panes.png" format="PNG"></inlinegraphic></link>
-<link linkend="GtkRadioButton"><inlinegraphic fileref="radio-group.png" format="PNG"></inlinegraphic></link>
-<link linkend="GtkSeparator"><inlinegraphic fileref="separator.png" format="PNG"></inlinegraphic></link>
-<link linkend="GtkToggleButton"><inlinegraphic fileref="toggle-button.png" format="PNG"></inlinegraphic></link>
-<link linkend="GtkWindow"><inlinegraphic fileref="window.png" format="PNG"></inlinegraphic></link>
+<link linkend="GtkAccelLabel"><inlinegraphic fileref="accel-label.png"
+format="PNG"></inlinegraphic></link> <link
+linkend="GtkButton"><inlinegraphic fileref="button.png"
+format="PNG"></inlinegraphic></link> <link
+linkend="GtkCheckButton"><inlinegraphic fileref="check-button.png"
+format="PNG"></inlinegraphic></link> <link
+linkend="GtkColorButton"><inlinegraphic fileref="color-button.png"
+format="PNG"></inlinegraphic></link> <link
+linkend="GtkComboBoxEntry"><inlinegraphic
+fileref="combo-box-entry.png" format="PNG"></inlinegraphic></link>
+<link linkend="GtkEntry"><inlinegraphic fileref="entry.png"
+format="PNG"></inlinegraphic></link> <link
+linkend="gtk-GtkFileChooserButton"><inlinegraphic
+fileref="file-button.png" format="PNG"></inlinegraphic></link> <link
+linkend="GtkFontButton"><inlinegraphic fileref="font-button.png"
+format="PNG"></inlinegraphic></link> <link
+linkend="GtkFrame"><inlinegraphic fileref="frame.png"
+format="PNG"></inlinegraphic></link> <link
+linkend="GtkIconView"><inlinegraphic fileref="icon-view.png"
+format="PNG"></inlinegraphic></link> <link
+linkend="GtkLabel"><inlinegraphic fileref="label.png"
+format="PNG"></inlinegraphic></link> <link
+linkend="GtkTreeView"><inlinegraphic fileref="list-and-tree.png"
+format="PNG"></inlinegraphic></link> <link
+linkend="GtkTextView"><inlinegraphic fileref="multiline-text.png"
+format="PNG"></inlinegraphic></link> <link
+linkend="GtkPaned"><inlinegraphic fileref="panes.png"
+format="PNG"></inlinegraphic></link> <link
+linkend="GtkRadioButton"><inlinegraphic fileref="radio-group.png"
+format="PNG"></inlinegraphic></link> <link
+linkend="GtkSeparator"><inlinegraphic fileref="separator.png"
+format="PNG"></inlinegraphic></link> <link
+linkend="GtkToggleButton"><inlinegraphic fileref="toggle-button.png"
+format="PNG"></inlinegraphic></link> <link
+linkend="GtkWindow"><inlinegraphic fileref="window.png"
+format="PNG"></inlinegraphic></link> <link
+linkend="GtkNotebook"><inlinegraphic fileref="notebook.png"
+format="PNG"></inlinegraphic></link> <link
+linkend="GtkMessageDialog"><inlinegraphic fileref="messagedialog.png"
+format="PNG"></inlinegraphic></link> <link
+linkend="GtkToolbar"><inlinegraphic fileref="toolbar.png"
+format="PNG"></inlinegraphic></link> <link
+linkend="GtkMenuBar"><inlinegraphic fileref="menubar.png"
+format="PNG"></inlinegraphic></link>
+linkend="GtkProgressBar"><inlinegraphic fileref="progressbar.png"
+format="PNG"></inlinegraphic></link>
 </para>
index 891d919ee3b6140502ca1ae3501e3802cb2fc359..b7d0ade89183d47e5df0d28b08e4a1a144f5d26c 100644 (file)
@@ -17,15 +17,23 @@ new_widget_info (const char *name,
 
   info = g_new0 (WidgetInfo, 1);
   info->name = g_strdup (name);
-  info->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  if (GTK_IS_WINDOW (widget))
+    {
+      info->window = widget;
+      info->include_decorations = TRUE;
+    }
+  else
+    {
+      info->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      info->include_decorations = FALSE;
+      gtk_widget_show_all (widget);
+      gtk_container_add (GTK_CONTAINER (info->window), widget);
+    }
   info->no_focus = TRUE;
-  info->include_decorations = FALSE;
 
   gtk_widget_set_app_paintable (info->window, TRUE);
   g_signal_connect (info->window, "focus", G_CALLBACK (gtk_true), NULL);
   gtk_container_set_border_width (GTK_CONTAINER (info->window), 12);
-  gtk_widget_show_all (widget);
-  gtk_container_add (GTK_CONTAINER (info->window), widget);
 
   switch (size)
     {
@@ -432,6 +440,118 @@ create_window (void)
   return info;
 }
 
+static WidgetInfo *
+create_toolbar (void)
+{
+  GtkWidget *widget, *menu, *vbox, *align;
+  GtkToolItem *item;
+
+  widget = gtk_toolbar_new ();
+
+  item = gtk_tool_button_new_from_stock (GTK_STOCK_NEW);
+  gtk_toolbar_insert (GTK_TOOLBAR (widget), item, -1);
+
+  item = gtk_menu_tool_button_new_from_stock (GTK_STOCK_OPEN);
+  menu = gtk_menu_new ();
+  gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (item), menu);
+  gtk_toolbar_insert (GTK_TOOLBAR (widget), item, -1);
+
+  item = gtk_tool_button_new_from_stock (GTK_STOCK_REFRESH);
+  gtk_toolbar_insert (GTK_TOOLBAR (widget), item, -1);
+
+  gtk_toolbar_set_show_arrow (GTK_TOOLBAR (widget), FALSE);
+
+#if 0
+  vbox = gtk_vbox_new (FALSE, 3);
+  align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
+  gtk_container_add (GTK_CONTAINER (align), widget);
+  gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox),
+                     gtk_label_new ("Toolbar"),
+                     FALSE, FALSE, 0);
+
+#endif
+  return new_widget_info ("toolbar", widget, SMALL);
+}
+
+static WidgetInfo *
+create_menubar (void)
+{
+  GtkWidget *widget, *vbox, *align, *item;
+
+  widget = gtk_menu_bar_new ();
+
+  item = gtk_menu_item_new_with_mnemonic ("_File");
+  gtk_menu_shell_append (GTK_MENU_SHELL (widget), item);
+
+  item = gtk_menu_item_new_with_mnemonic ("_Edit");
+  gtk_menu_shell_append (GTK_MENU_SHELL (widget), item);
+
+  item = gtk_menu_item_new_with_mnemonic ("_Help");
+  gtk_menu_shell_append (GTK_MENU_SHELL (widget), item);
+
+  vbox = gtk_vbox_new (FALSE, 3);
+  align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
+  gtk_container_add (GTK_CONTAINER (align), widget);
+  gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox),
+                     gtk_label_new ("Menu Bar"),
+                     FALSE, FALSE, 0);
+
+  return new_widget_info ("menubar", vbox, SMALL);
+}
+
+static WidgetInfo *
+create_message_dialog (void)
+{
+  GtkWidget *widget;
+
+  widget = gtk_message_dialog_new (NULL,
+                                  0,
+                                  GTK_MESSAGE_INFO,
+                                  GTK_BUTTONS_OK,
+                                  NULL);
+  gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (widget),
+                                "<b>Message Dialog</b>");
+  return new_widget_info ("messagedialog", widget, MEDIUM);
+}
+
+static WidgetInfo *
+create_notebook (void)
+{
+  GtkWidget *widget;
+
+  widget = gtk_notebook_new ();
+
+  gtk_notebook_append_page (GTK_NOTEBOOK (widget), 
+                           gtk_label_new ("Notebook"),
+                           NULL);
+  gtk_notebook_append_page (GTK_NOTEBOOK (widget), gtk_event_box_new (), NULL);
+  gtk_notebook_append_page (GTK_NOTEBOOK (widget), gtk_event_box_new (), NULL);
+
+  return new_widget_info ("notebook", widget, MEDIUM);
+}
+
+static WidgetInfo *
+create_progressbar (void)
+{
+  GtkWidget *vbox;
+  GtkWidget *widget;
+  GtkWidget *align;
+
+  vbox = gtk_vbox_new (FALSE, 3);
+  align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
+  widget = gtk_progress_bar_new ();
+  gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (widget), 0.5);
+  gtk_container_add (GTK_CONTAINER (align), widget);
+  gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox),
+                     gtk_label_new ("Progress Bar"),
+                     FALSE, FALSE, 0);
+
+  return new_widget_info ("progressbar", vbox, SMALL);
+}
+
 GList *
 get_all_widgets (void)
 {
@@ -455,6 +575,11 @@ get_all_widgets (void)
   retval = g_list_prepend (retval, create_accel_label ());
   retval = g_list_prepend (retval, create_file_button ());
   retval = g_list_prepend (retval, create_icon_view ());
+  retval = g_list_prepend (retval, create_toolbar ());
+  retval = g_list_prepend (retval, create_menubar ());
+  retval = g_list_prepend (retval, create_notebook ());
+  retval = g_list_prepend (retval, create_message_dialog ());
+  retval = g_list_prepend (retval, create_progressbar ());
 
   return retval;
 }